Merge branch 'master' of git://www.denx.de/git/u-boot-mips
authorWolfgang Denk <[email protected]>
Wed, 9 Jul 2008 21:24:23 +0000 (23:24 +0200)
committerWolfgang Denk <[email protected]>
Wed, 9 Jul 2008 21:24:23 +0000 (23:24 +0200)

Trivial merge